ci: Add diffutils to the CI image
authorEmmanuele Bassi <ebassi@gnome.org>
Fri, 1 Nov 2019 15:22:02 +0000 (15:22 +0000)
committerEmmanuele Bassi <ebassi@gnome.org>
Fri, 1 Nov 2019 15:22:02 +0000 (15:22 +0000)
Some transitive dependency got dropped, and we lost diff.

.gitlab-ci/Dockerfile
.gitlab-ci/run-docker.sh

index 22553c36e8bc05cf49b1d0dbc59e0e5b612b401d..391f1af9c764048c8c6f1b6db404a5afca93436d 100644 (file)
@@ -1,7 +1,6 @@
 FROM fedora:31
 
 RUN dnf -y install \
-    hicolor-icon-theme \
     adwaita-icon-theme \
     atk-devel \
     at-spi2-atk-devel \
@@ -14,6 +13,7 @@ RUN dnf -y install \
     dbus-daemon \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
+    diffutils \
     elfutils-libelf-devel \
     fribidi-devel \
     gcc \
@@ -32,6 +32,7 @@ RUN dnf -y install \
     gstreamer1-plugins-bad-free-devel \
     gstreamer1-plugins-base-devel \
     gtk-doc \
+    hicolor-icon-theme \
     iso-codes \
     itstool \
     json-glib-devel \
index b0857777eed5a781a4248cf4a1fc434dcdd495ec..4892769c8871e931dd61df6a11bec8c985afe200 100755 (executable)
@@ -2,7 +2,7 @@
 
 set -e
 
-TAG="registry.gitlab.gnome.org/gnome/gtk/master:v6"
+TAG="registry.gitlab.gnome.org/gnome/gtk/master:v7"
 
 sudo docker build --build-arg HOST_USER_ID="$UID" --tag "${TAG}" \
     --file "Dockerfile" .